Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Wed, 13 May 2015 14:46:54 +0000 (15:46 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Wed, 13 May 2015 14:46:54 +0000 (15:46 +0100)
commit7cb37dfaaaafd42df7413c81100a6eb117e047a1
tree301902db67bc4f1d4be42fc1c7219336c03ea157
parente78e8b9bb649bf0f18d940fb12a4f6c55be34915
parent7349efc695852c70b8c5e24d9ecf208757e8b471
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging